Update git.mk, respects AC_CONFIG_AUX_DIR now

diff --git a/Makefile.am b/Makefile.am
index 509d5046f1b8a5614238b73607e759ee5477f6b7..4da3fd0b6297db5e8c7f657c06091b309275fce9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,24 +21,15 @@ EXTRA_DIST +=                       \
        po/po2tbl.sed.in
 
 MAINTAINERCLEANFILES = \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(srcdir)/INSTALL \
        $(srcdir)/README \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/autoscan.log \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
-       $(srcdir)/configure.scan \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
        $(srcdir)/omf.make \
        $(srcdir)/xmldocs.make \
        $(srcdir)/gtk-doc.make \
-       $(srcdir)/ChangeLog \
-       `find "$(srcdir)" -type f -name Makefile.in -print`
+       $(srcdir)/ChangeLog
 
 
 ## Copy .pc files to target-specific names

diff --git a/git.mk b/git.mk
index cd699b46c80f2f7bd7ff60ef462a47943ed6d570..2a144a8fa88adf15c29067ebd055fc8d394c7f50 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -75,18 +75,21 @@
 # toplevel MAINTAINERCLEANFILES:
 GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
        $(srcdir)/aclocal.m4 \
-       $(srcdir)/ar-lib \
        $(srcdir)/autoscan.log \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
        $(srcdir)/configure.scan \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs
+       `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1'); for x in \
+               ar-lib \
+               compile \
+               config.guess \
+               config.sub \
+               depcomp \
+               install-sh \
+               ltmain.sh \
+               missing \
+               mkinstalldirs \
+        ; do echo "$$AUX_DIR/$$x"; done` \
+       `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \
+       head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
 #
 # All modules should also be fine including the following variable, which
 # removes automake-generated Makefile.in files: